Deprecate gtk_menu_bar_append/prepend/insert, forgot to do this when we

Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate
	gtk_menu_bar_append/prepend/insert, forgot to do this
        when we deprecated gtk_menu_append/prepend/insert.

        * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
        compat macros.

	       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
	renamed by compat macro.

	* gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
        gtk_font_selection_dialog_get_font(). (Suggested by
	       Vitaly Tishkov, #59383)

diff --git a/ChangeLog b/ChangeLog
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5fff1f5aa5568fe65fdac32ae2000a0604e1eb13..d9c59f8738ff4df7f87bfee7c97d4fb0d880c19f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+Thu Aug 23 19:10:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate 
+       gtk_menu_bar_append/prepend/insert, forgot to do this
+       when we deprecated gtk_menu_append/prepend/insert.
+
+       * gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
+       compat macros.
+
+       * gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
+       renamed by compat macro.
+
+       * gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
+       gtk_font_selection_dialog_get_font(). (Suggested by
+       Vitaly Tishkov, #59383)
+
 Thu Aug 23 18:23:31 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktexttag.c (gtk_text_tag_table_get_size): 

diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 16688f09d5d72c1fc89c0f48642ba61b43a59b10..71ecfca0bcefa461e5e0fcdfe8d93f499c6b0978 100644 (file)
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -118,18 +118,18 @@ do_menus (void)
       
       menuitem = gtk_menu_item_new_with_label ("test\nline2");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
-      gtk_menu_bar_append (GTK_MENU_BAR (menubar), menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
       
       menuitem = gtk_menu_item_new_with_label ("foo");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
-      gtk_menu_bar_append (GTK_MENU_BAR (menubar), menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
       menuitem = gtk_menu_item_new_with_label ("bar");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
       gtk_menu_item_right_justify (GTK_MENU_ITEM (menuitem));
-      gtk_menu_bar_append (GTK_MENU_BAR (menubar), menuitem);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
       
       box2 = gtk_vbox_new (FALSE, 10);

diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index a35ebd12fced2d5f0c80bb117be56ed2d119ad4b..aa39d163726959bab73f80af6aadb1681656f7b4 100644 (file)
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -123,7 +123,11 @@ struct _GtkFontSelectionDialogClass
 GtkType           gtk_font_selection_get_type          (void) G_GNUC_CONST;
 GtkWidget* gtk_font_selection_new              (void);
 gchar*    gtk_font_selection_get_font_name     (GtkFontSelection *fontsel);
+
+#ifndef GTK_DISABLE_DEPRECATED
 GdkFont*   gtk_font_selection_get_font         (GtkFontSelection *fontsel);
+#endif /* GTK_DISABLE_DEPRECATED */
+
 gboolean   gtk_font_selection_set_font_name    (GtkFontSelection *fontsel,
                                                 const gchar      *fontname);
 gchar*    gtk_font_selection_get_preview_text  (GtkFontSelection *fontsel);
@@ -148,10 +152,12 @@ GtkWidget* gtk_font_selection_dialog_new  (const gchar      *title);
    You should g_free() the returned font name after you're done with it. */
 gchar*  gtk_font_selection_dialog_get_font_name    (GtkFontSelectionDialog *fsd);
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* This will return the current GdkFont, or NULL if none is selected or there
    was a problem loading it. Remember to use gdk_font_ref/unref() if you want
    to use the font (in a style, for example). */
 GdkFont* gtk_font_selection_dialog_get_font        (GtkFontSelectionDialog *fsd);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* This sets the currently displayed font. It should be a valid X Logical
    Font Description font name (anything else will be ignored), e.g.

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b4177d341da0e4d212b38ade241a4692146c714e..5cdb8213717e17d2dc88a437b43abb6116301c67 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -86,7 +86,7 @@ static void     gtk_menu_stop_scrolling    (GtkMenu          *menu);
 static gboolean gtk_menu_scroll_timeout    (gpointer          data);
 static void     gtk_menu_select_item       (GtkMenuShell     *menu_shell,
                                            GtkWidget        *menu_item);
-static void     gtk_menu_insert            (GtkMenuShell     *menu_shell,
+static void     gtk_menu_real_insert       (GtkMenuShell     *menu_shell,
                                            GtkWidget        *child,
                                            gint              position);
 static void     gtk_menu_scrollbar_changed (GtkAdjustment    *adjustment,
@@ -178,7 +178,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   menu_shell_class->submenu_placement = GTK_LEFT_RIGHT;
   menu_shell_class->deactivate = gtk_menu_deactivate;
   menu_shell_class->select_item = gtk_menu_select_item;
-  menu_shell_class->insert = gtk_menu_insert;
+  menu_shell_class->insert = gtk_menu_real_insert;
 
   binding_set = gtk_binding_set_by_class (class);
   gtk_binding_entry_add_signal (binding_set,
@@ -448,9 +448,9 @@ gtk_menu_new (void)
 }
 
 static void
-gtk_menu_insert (GtkMenuShell     *menu_shell,
-                GtkWidget        *child,
-                gint              position)
+gtk_menu_real_insert (GtkMenuShell     *menu_shell,
+                     GtkWidget        *child,
+                     gint              position)
 {
   if (GTK_WIDGET_REALIZED (menu_shell))
     gtk_widget_set_parent_window (child, GTK_MENU (menu_shell)->bin_window);

diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 9acfb410b0d618e5de5c45bccb1395f04e0ac3da..1afe0ec0767f0e114c642b06e6779db4e96bdb72 100644 (file)
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -179,9 +179,9 @@ void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            gint                position);
 
 #ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_append                                gtk_menu_shell_append
-#define gtk_menu_prepend                       gtk_menu_shell_prepend
-#define gtk_menu_insert                                gtk_menu_shell_insert
+#define gtk_menu_append(menu,child)    gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
+#define gtk_menu_prepend(menu_child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
+#define gtk_menu_insert(menu,child,pos)        gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child),(pos))
 #endif /* GTK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 0b9bef352211b28656ffe37f19106bfe09c83f95..bf2e27c7f41e7d86db026b78de2020d667e631ef 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -174,29 +174,6 @@ gtk_menu_bar_new (void)
   return GTK_WIDGET (gtk_type_new (gtk_menu_bar_get_type ()));
 }
 
-void
-gtk_menu_bar_append (GtkMenuBar *menu_bar,
-                    GtkWidget  *child)
-{
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), child);
-}
-
-void
-gtk_menu_bar_prepend (GtkMenuBar *menu_bar,
-                     GtkWidget  *child)
-{
-  gtk_menu_shell_prepend (GTK_MENU_SHELL (menu_bar), child);
-}
-
-void
-gtk_menu_bar_insert (GtkMenuBar *menu_bar,
-                    GtkWidget  *child,
-                    gint        position)
-{
-  gtk_menu_shell_insert (GTK_MENU_SHELL (menu_bar), child, position);
-}
-
-
 static void
 gtk_menu_bar_size_request (GtkWidget      *widget,
                           GtkRequisition *requisition)

diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 195f94ee3523c9ffe2e9223da14598aec462c7a2..658af17c410a815c74c1617afc8fdd50abb5d5a5 100644 (file)
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -61,13 +61,12 @@ struct _GtkMenuBarClass
 
 GtkType    gtk_menu_bar_get_type        (void) G_GNUC_CONST;
 GtkWidget* gtk_menu_bar_new             (void);
-void       gtk_menu_bar_append          (GtkMenuBar    *menu_bar,
-                                        GtkWidget     *child);
-void       gtk_menu_bar_prepend         (GtkMenuBar    *menu_bar,
-                                        GtkWidget     *child);
-void       gtk_menu_bar_insert          (GtkMenuBar    *menu_bar,
-                                        GtkWidget     *child,
-                                        gint           position);
+
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_menu_bar_append(menu,child)            gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
+#define gtk_menu_bar_prepend(menu_child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
+#define gtk_menu_bar_insert(menu,child,pos) gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child),(pos))
+#endif /* GTK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus
 }